typo fix
Merge branch 'master' into gen_component

* master:
  typo fix