Merge "Use OutputPage::addWikiTextAsInterface() instead of untidy addWikiText()"

diff --cc includes/OutputPage.php
Simple merge

diff --cc includes/page/Article.php
Simple merge

diff --cc includes/page/ImagePage.php
Simple merge