fix to mime types
Merge branch 'local' into development