Merge "Fix return doc and update whitespace in SpecialBlock.php"