Merge branch 'pcre-8.31' into 'master'