Merge HEAD, branch 'master' of https://github.com/twaddington/mirror-quickstart-android

Conflicts:
	mirror-quickstart-android/build.gradle