Fixed spelling mistakes
Merge branch '2.1' into 2.2

* 2.1:
  Fixed spelling mistakes