AUI-1290 Yogi loader regenerate
Merge branch 'master' into master-deprecated

Conflicts:
	src/aui-base/js/aui-loader.js