MediaWiki extension
Merge branch 'mw-extension' into dev