Fix partial word search.
Merge remote-tracking branch 'me/master' into scott