Merge "Fix long file paths for Windows"