Add manual mime types.
Merge branch 'master' into 1237862-pep-257