some small fixes etc
Merge branch 'master' of https://github.com/gogo/protobuf