Merge branch 'jc/grep-lookahead'