Allow a callback to override any formatting
Refactoring
More refactoring
Don't cache
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/field_types/relationship/src/Pyro/FieldType/Relationship.php
	system/cms/modules/streams_core/field_types/slug/src/Pyro/FieldType/Slug.php
	system/cms/modules/streams_core/field_types/text/src/Pyro/FieldType/Text.php
	system/cms/modules/streams_core/field_types/textarea/src/Pyro/FieldType/Textarea.php
	system/cms/modules/streams_core/field_types/user/src/Pyro/FieldType/User.php
	system/cms/modules/streams_core/src/Pyro/Module/Streams/FieldType/FieldTypeAbstract.php
Merge branch 'refs/heads/3.0/develop' into production