Merge remote-tracking branch 'upstream/master' into helloworld

Conflicts:
README.md