Merge pull request #839 from Ansuel/rtengine-pcre2