(Vim) Find with more familiar regex.
(Vim) Do not auto-format!
Merge branch 'adopt' into trial

    + Fix conflicts from cherry-picking...