Merge branch 'jc/grep--no-index-pathspec-fix' into next