Merge branch 'master' into Updates
Update media module
Update entity module
Update core to 7.26
Merge branch 'Updates'