Merge branch 'dm/mergetool-vimdiff'