Merge master into release in preparation for Gradle 2.0 release