Upgraded to Gradle 1.7