Fix typo
Merge branch 'master' into 2.1

* master:
  Fix typo