Merge branch 'ml/color-grep'