Merge commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870' * commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870': Add extension->mime type mappings
Merge commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870' * commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870': Add extension->mime type mappings