Merge branch 'rs/color-escape-has-zero-width'