Gradle 2.1 compatibility