Merge branch 'jk/config-type-color-ends-with-lf'