Correct the JDK level.
Reassert the Gradle 1.10 version.
Merge branch 'master' into jdk7