STS3592 Gradle part. For Kris to review
Merge branch 'alex-master'