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