Fixed typos.  No functional difference.
Merge remote-tracking branch 'origin/master'