Update README.md
Merge master into deployment/staging