templates min
Merge branch 'master' into requirejs-b3