Add internet_media_type (mime_type) support
Merge branch 'full-output'