Update.
Update.
Merge branch 'develop'
Merge branch 'master' into release-support

Conflicts:
	artifacts/fragments-3.6-javadoc.jar
	artifacts/fragments-3.6-sources.jar
	artifacts/fragments-3.6.aar