Merge new upstream mimetypes (which describe themselves as placeholders)