CORE: search server crash fix
Merge branch 'master' of https://github.com/DarkstarProject/darkstar