Changes "media" button to "gallery", which makes more sense
Merge branch 'master' into misti