Fix #1680 : Add support for custom extension to mime-type mapping
Merge pull request #946 from romainneutron/fix-1680

[3.8] Fix #1680 : Add support for custom extension to mime-type mapping
Merge branch '3.8'
Fix latest merge