Merge "Use a better regular expression to find documented hooks in findHooks.php"