Rob Winch 20b0156d5a Merge branch '6.0.x' 2 lat temu
..
main 20b0156d5a Merge branch '6.0.x' 2 lat temu
site cb4f3d2f44 Use UTF-8 for Java sources and XML 6 lat temu
test 5e2dd0351d Merge branch '6.0.x' 2 lat temu