fix merge
5.0.2
Merge branch 'master' of github.com:substack/node-browserify