Merge branch 'mg/maint-difftool-vim-readonly' into maint