Fixed a typo
Merge branch '0.10-maintenance'