Update to new goprotobuf
Merge branch 'master' into go1