Paul Yang f425b9f059 Merge pull request #5953 from acozzette/merge-3-7-x 6 anni fa
..
protobuf_c f425b9f059 Merge pull request #5953 from acozzette/merge-3-7-x 6 anni fa