Paul Yang f425b9f059 Merge pull request #5953 from acozzette/merge-3-7-x %!s(int64=6) %!d(string=hai) anos
..
protobuf_c f425b9f059 Merge pull request #5953 from acozzette/merge-3-7-x %!s(int64=6) %!d(string=hai) anos