Merge branch 'master' into ui-contextmenu

Conflicts:
	utils/minify.sh