Merge Browserify to master