Merge pull request #1720 from Tom-Ski/master

Ensure compatibility with the Android gradle plugin
Merge remote-tracking branch 'upstream/master'