merged changes from MediaWiki_Api