Update for latest gradle versions
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Update gradle for 5.1.0-SNAPSHOT