do not use uglifier
Merge branch 'master' into staging