Merge branch 'lh/use-gnu-color-in-grep'