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

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/parser/Parser.php
Simple merge

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

diff --cc maintenance/refreshLinks.php
Simple merge

diff --cc tests/phpunit/maintenance/backupPrefetchTest.php
Simple merge

diff --cc tests/phpunit/maintenance/backupTextPassTest.php
Simple merge