Gotta love collections
Details details details
Merge branch '2.3/develop' of https://github.com/pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/entries/tabbed_form.php