Merge "Fix long paths on Windows"