Merge branch 'jc/test-say-color-avoid-echo-escape' into maint