Remove wildcard on any search string - if the user wants that they
can add it themselves
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x