gradle & mvn
Merge branch 'master' into mac