Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead