Merge branch 'master' into unstable_staging

Conflicts:
	build.gradle
	build.upload
	pom.xml