MSL 3.2.1 changes to Media
Merge branch 'openmodelica' into modelica-3.2.1
Merge pull request #99 from lbl-srg/master

Merged fix from Martin Sjoelund to OpenModelica branch
Merge pull request #100 from sjoelund/modelica-3.2.1

Merged changes in Media from Martin Sjoelund's fork
Merge pull request #101 from lbl-srg/openmodelica

Merged media changes from openmodelica branch