styles and name and public
Merge branch 'master' into bindings

* master:
  styles and name and public