Updated gradle files.
Prepared for 4.1.2 update.
Merge branch 'develop'