Rob Winch 20b0156d5a Merge branch '6.0.x' %!s(int64=2) %!d(string=hai) anos
..
main 20b0156d5a Merge branch '6.0.x' %!s(int64=2) %!d(string=hai) anos
site cb4f3d2f44 Use UTF-8 for Java sources and XML %!s(int64=6) %!d(string=hai) anos
test 5e2dd0351d Merge branch '6.0.x' %!s(int64=2) %!d(string=hai) anos