Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint