Merge "Follow-up ebe7205c: Edit stash: Unbreak jQuery selectors"