Fix pagination for filtered results
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/Cp/Entries.php