Support for media object.
Merge branch 'develop'