Merge remote-tracking branch 'upstream/master' into widgets-shortcuts

Conflicts:
	src/editor.jsx
	src/util.js