Merge branch 'master' into opensim

Conflicts:
	utils/minify.sh