Mediawiker Pull Request

Comparison simply between the Holek branch of the master and the tosher branch of the same.  Ability still to merge has been assured.  Merging taking place at 04:59:00 GMT.