Updated to Gradle 2.1