No current color
Merge branch 'master' into cap