Merge branch 'safer-build' into staging2

Conflicts:
	submodules/formdesigner