Merge branch 'mm/mediawiki-encoding-fix'