Merge branch 'uglifyjs'