Updated to master version. No local changes in mediawiki branch.