gradle runs without issue.
Merge remote-tracking branch 'origin/master' into v2.1