fix resetting of color
Merge branch 'upstream'