Merge "Add Gradle 1.6"