Merge "Normalise inline comment markers to "//" in WikiPage.php"