Merge branch 'stable-6.1'

Author: MarkEWaite

pom.xml

@@ -32,7 +32,7 @@
   </scm>
 
   <properties>
-    <revision>6.1.1</revision>
+    <revision>6.1.2</revision>
     <changelist>-SNAPSHOT</changelist>
     <!-- Character set tests fail unless file.encoding is set -->
     <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>