Typo fixes
Merge remote-tracking branch 'origin/0.8'