gradle: update
Merge remote-tracking branch 'agap/master' into HEAD