Fixes inconsistent Search button naming in Basic theme.
Merge remote-tracking branch 'upstream/master'