Merge master into branch
Merge branch 'master' into install-xcode-store

* master:
  Merge master into branch
Grammar corrections