Merge remote-tracking branch 'upstream/master' into unused-vars

Conflicts:
	src/search/FindReplace.js
	src/utils/ViewUtils.js