merge from master
fix a few typos
Merge remote-tracking branch 'refs/remotes/local/next_feature'