Minor updates.
Merge branch 'develop'
Merge branch 'master' into release-support

Conflicts:
	artifacts/support-fragments-4.1.aar
Minor updates.