Pre-merge
Merge branch 'master' of https://github.com/dcodeIO/ProtoBuf.js
Post-merge