Completed conversion to Gradle 1.3