Should fix #492, removing the double copy
Merge remote-tracking branch 'origin/gradle-lang' into gradle-lang