Merge branch 'dl/difftool-mergetool'