Fix minification bug
Merge remote branch 'upstream/master'