Squashed 'bundle/bufstop-search/' changes from 3a61cbb..cfbc979

cfbc979 fixes

git-subtree-dir: bundle/bufstop-search
git-subtree-split: cfbc979bbaf245e5ff3d36f647e867c540696dbe
Merge commit '0f6fffdc260470eed57ddd8d5af59659b51fe029'
updates