Merge "Support uploads with UTF-8 names on Windows"