Merge branch 'cm/remote-mediawiki'