replace deprecated mimetype with content_type
Merge remote-tracking branch 'upstream/master'