fixed typo
Merge branch '2.4' into 2.5

* 2.4:
  fixed typo
Merge branch '2.5'

* 2.5:
  fixed typo