Merge upstream changes
Remove proto/mercury.desc
camelCase proto/mercury.proto
Implement new ProtoBuf.js API