Merge branch 'tb/push-to-cygwin-unc-path' into maint