Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'