automerge: a27e1a3 * commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08': Be more conservative about current buffer