I'd like @sgoings or @dougborg to have a look at these Gradle changes before we merge this in, if you guys have time.