Merge "Revert "MediaWiki.php: Redirect non-standard title urls to canonical""