in-passing typo
by default, don't highlight a feature that was searched for after searching
Merge remote-tracking branch: upstream/master