Merge pull request #2953 from codesparkle/ndr-regexes-escape-correctly