Added a dependency on media module to work with uploaded content.
Merge branch 'refs/heads/release'