Merge branch 'master' into gradle-master