Merge: rev812 (fixed admin media prefix)