Merge branch 'mm/mediawiki-author-fix'