re 3.0-rc-2 version bump
Merge branch 'release/3.0' into develop

Conflicts:
	build.gradle