Fixed a few typos.
Improvements
Fix conflicts.
Merge pull request #4222 from GrahamCampbell/4.1-stuff

[4.1] Improvements
Fixing conflicts and merge.