Gradle commit
Merge origin/master