Merge branch '3.8'

Conflicts:
	lib/classes/Feed/Collection.php
	tests/classes/Feed/Feed_CollectionTest.php
Add compatibility with elasticsearch 1