Update README.md
Merge remote-tracking branch 'upstream/master' into continuous-integration

Conflicts:
	README.md