Typo fixes and adjustments
Merge remote-tracking branch 'origin/0.14'