Minified versions
Use minified versions
Merge with master
Update html