Merge branch 'ab/grep-plug-pathspec-leak'