Merge remote-tracking branch 'openntf/master' into work

Conflicts:
	jaggr-core/WebContent/dojo/_loaderExt.js