Merge changes into SphinxSearchEngine (warning! requires reindexing!)