Updated to support Gradle 1.10