small typo in error message
minor typo in comment
minor typos in comment
Merge remote-tracking branch 'origin/master'