* master: Typos in code comments, an error message, documentation Typos in code comments, an error message, documentation Conflicts: compat/regex/regex.c