Merge branch 'rs/grep-color'