Upgrades to work with Gradle 1.7