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