Josh Cummings 0579be0d25 Merge branch '6.0.x' into 6.1.x 2 gadi atpakaļ
..
main 0579be0d25 Merge branch '6.0.x' into 6.1.x 2 gadi atpakaļ
site cb4f3d2f44 Use UTF-8 for Java sources and XML 6 gadi atpakaļ
test 0579be0d25 Merge branch '6.0.x' into 6.1.x 2 gadi atpakaļ