Merge "(bug 37138) Fix broken Google sitesearch in DatabaseError"