Merge latest Gradle template