Rebased to upstream/master

Author: clydebarrow

build.gradle

@@ -105,7 +105,6 @@ subprojects {
 
 	compileJava {
 		options.compilerArgs = [ '-Xlint:deprecation', '-Xlint:-options', '-Werror' ]
-		options.encoding = 'UTF-8'
 	}
 
 	tasks.withType(JavaCompile) {
@@ -274,4 +273,4 @@ configurations {
 
 artifacts {
 	archives docsZip
-}
+}