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

* commit '6e11b111985afea3c4c2e27652645c3cdfcbee7f':
  Add support for multiple items in a single mime type.