4.1 updates.
Merge branch 'develop'

Conflicts:
	artifacts/support-fragments-4.1.aar