Upgrade to Gradle 1.7.
Merge branch 'master' into jdk7