Updates.
Updated gradle files.
Updated gradle files.
Merged.
Merge branch 'master' into release-support

Conflicts:
	.idea/modules.xml
	library/library.iml
	library/pom.xml
Updated.