Merge "Adding mimetypes to the mimetype map used in the web view"