Update for Gradle 1.6