Merge branch 'master' into release

Conflicts:
	.idea/gradle.xml