U.
Merge branch 'develop'
Merge branch 'master' into release-support
Updated.
Merge branch 'release-support' into release

Conflicts:
	.idea/modules.xml
	artifacts/fragments-3.2-javadoc.jar
	artifacts/fragments-3.2-sources.jar
	artifacts/fragments-3.2.aar
Updated.