merged from master
merged from remote
Merge branch 'development-dev' of git://github.com/floriansemm/SolrBundle into development-dev