Merge "Improve wfEscapeWikiText, part 2"