Merge remote-tracking branch 'upstream/master' into simplify-parse-dollars

Conflicts:
	src/search/FindReplace.js