Updated for use with Gradle 2.1