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

* commit '2e40b1dc47a413e308332f81ee585eed7e09d815':
  Add support for multiple items in a single mime type.