Merge branch 'jc/grep-pcre-loose-ends'