This.. what?
Merge branch 'refs/heads/3.0/develop' into production

Conflicts:
	system/cms/modules/streams_core/field_types/user/src/Pyro/FieldType/User.php