Squashed 'bundle/bufstop-search/' content from commit a0c8eef

git-subtree-dir: bundle/bufstop-search
git-subtree-split: a0c8eef920ebcab0683fac1eeccd58ec28d92c42
Merge commit 'f5aa8b1cad1d4c691b0bcdb31db3e86ee25aaa52' as 'bundle/bufstop-search'