(refs #554)Search box bug fix
Merge remote-tracking branch 'upstream/master'