removed search_log, added apachesolr_stats instead
Merge remote-tracking branch 'origin/master' into develop