Update to MediaWiki 1.22.6
Merge branch 'master' into archfr