Update README.md
Merge branch 'master' into 2.2

* master:
  Update README.md