Applying modified version of patch #1018386, which fixes
some escaping bugs in SRE.
3 files changed