Merge branch 'cm/remote-mediawiki' into next