Squashed 'bundle/bufstop-search/' changes from be645b5..5a22fce

5a22fce fixes

git-subtree-dir: bundle/bufstop-search
git-subtree-split: 5a22fceb8281f601e038d832f4edeedab7f6a7dc
Merge commit '5acfda74243c7ce4aaf9ccb444df798d9b0a3f31'
updates