clean up
Merge branch 'master' into uistyling

* master:
  clean up