Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/AutoLoader.php
Simple merge

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/ImagePage.php
Simple merge

diff --cc includes/WikiPage.php
Simple merge

diff --cc includes/api/ApiComparePages.php
Simple merge

diff --cc includes/api/ApiDelete.php
Simple merge

diff --cc includes/api/ApiEditPage.php
Simple merge

diff --cc includes/api/ApiPurge.php
Simple merge

diff --cc includes/api/ApiQueryRevisions.php
Simple merge

diff --cc includes/diff/DifferenceEngine.php
Simple merge

diff --cc includes/specials/SpecialNewpages.php
Simple merge

diff --cc languages/Language.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
Simple merge

diff --cc maintenance/cleanupSpam.php
Simple merge