expr-v2: make sure we have a color-value
Merge branch 'branch-0.6'