Allow limit overriding
Oop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/src/Pyro/Module/Streams/Ui/EntryUi.php
This is bets
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Merge branch 'refs/heads/3.0/develop' into AIWS/production