#1678: Update Media module to latest dev
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7