Merge branch 'master' into 3.4-IP

Conflicts:
	build.gradle
	readme.md