fix control-lable text color
Merge branch 'master' into gh-pages