Another search bug reported by John Heidemann
Merge remote-tracking branch 'ucla/master'