Merge branch 'mm/mediawiki-tests'