Fix ADMIN_MEDIA_PREFIX
Merge branch 'master' into experimental