Merge branch 'rr/complete-difftool-fixup' into next