Merge branch 'da/difftool-git-files' into maint