Merge branch 'master' into calvin

* master:
  ..
pastel colors
Merge branch 'calvin'

* calvin:
  pastel colors