tarsius Merge branch 'jb/display-buffer' [magit#2282]