Merge branch 'rs/grep-binary' into next