Merge branch 'mm/remote-mediawiki-build'