Merge branch 'rs/grep-no-recursive'