Merge branch 'dw/mergetool-vim-window-shuffle' into maint