Merge branch 'single-project' into single-project-test

Conflicts:
	gradle/release.gradle
Merge branch 'single-project' into single-project-test
Merge branch 'single-project' into single-project-test
Merge branch 'single-project' into single-project-test
Merge branch 'single-project' into single-project-test