Bump gradle plugin version
Merge branch 'master' into material-design