Merge pull request #2672 from stgeneral/patch-1

Exra bmp mimes