Merge remote-tracking branch 'upstream/master' into lodash-cleanup

Conflicts:
	src/document/DocumentCommandHandlers.js