Backport regex fix to 3.6#334

jjhelmus merged 4 commits intoconda-forge:3.6conda-forge/python-feedstock:3.6from

SylvainCorlay:backport-regex-fix-3.6SylvainCorlay/python-feedstock:backport-regex-fix-3.6Copy head branch name to clipboard