Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md