Fix issue #230
Merge branch 'fix-pivot-extra-params' of github.com:FredM/solarium into develop

Conflicts:
	tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php
Merge branch 'develop' of github.com:basdenooijer/solarium into develop