Fixed an obvious typo.
Merge branch 'master' into ticket-17365-new

* master:
  Fixed an obvious typo.