add missing pagination option
Fix regression with previous merge
Fix regression in the rss link generation
Fix composer.json
Merge branch 'sonata/master'

Conflicts:
	composer.json