Merge branch 'master' into vellum-requirejs

Conflicts:
	submodules/formdesigner