Updated gradle files.
Updates.
Updates.
Merge branch 'master' into release
Updates.