Merge branch 'MediaWiki' into dev