Merge branch 'gold2'

Conflicts:
	README.md
Merge branch 'upstream/master'

Conflicts:
	README.md