Fixed a typo
Merge remote-tracking branch 'origin/0.5'