Merge branch 'jc/color-attrs' into maint