Merge branch 'gradle' into eclipse