Merge branch 'da/difftool' into maint