MediaBundle support
Merge branch 'master' into 1.0

* master:
  MediaBundle support