Merge branch 'win32-accommodate-funny-drive-names'