Fix typo
Merge branch '1.0'

* 1.0:
  Fix typo