Working(?) gradle
Merge origin/master
Working(?) gradle