Trying again with uglify removed
Merge remote-tracking branch 'origin/master'
Trying again with uglify removed