Merge branch 'ab/pcre-v2' into maint