Merge "Customizable MIME type <-> file extension mapping, step 3."