161f7c9be8
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0': Misc. media API changes
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0': Misc. media API changes