Adam Cozzette 94d55e5292 Merge branch '3.6.x' into merge-3-6-x %!s(int64=7) %!d(string=hai) anos
..
protobuf 94d55e5292 Merge branch '3.6.x' into merge-3-6-x %!s(int64=7) %!d(string=hai) anos