manually merge #152

props @peiche

- fixes editor js error if user has visual editor turned off in settings
uglify