Changed font color
Merge branch 'master' into ws-direct