magit-branch-manager: add kludge for #1215
Merge branch 'master' into next