Merge branch 'master' into iwehrman/untitled-temp-files

Conflicts:
	src/document/DocumentManager.js