Upgrade to Gradle 1.8.
Merge branch 'master' into develop