Merge branch '3.0.x'

Author: wilkinsona

gradle.properties

@@ -4,6 +4,6 @@ org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 
-javaFormatVersion=0.0.43
+javaFormatVersion=0.0.47
 jmustacheVersion=1.15
 springFrameworkVersion=7.0.0-M1