Merge pull request #702 from nickhutchinson/feature/win32-escaping-fix