Joe Grandja 668ad6ce59 Merge branch '0.4.x' into 1.0.x %!s(int64=2) %!d(string=hai) anos
..
main ec32aa9138 Merge branch '0.4.x' into 1.0.x %!s(int64=2) %!d(string=hai) anos
test 668ad6ce59 Merge branch '0.4.x' into 1.0.x %!s(int64=2) %!d(string=hai) anos