Update README.md
Merge remote-tracking branch 'origin/master' into web
Merge branch 'web' into examples-web