Merge branch 'rj/maint-difftool-cygwin-workaround'