merge master
merge master

floriansemm/SolrBundle,floriansemm/SolrBundle,clarity-project/SolrBundle,drdk/SolrBundle,drdk/SolrBundle,clarity-project/SolrBundle,zquintana/SunSearchBundle,zquintana/SunSearchBundle