Merge "Add support for multiple items in a single mime type." into klp-dev