Merge pull request #3861 from aanbar/update_mime_types

Update mime types