Update README.md
Merge remote-tracking branch 'origin/master' into feature/1234_chris_feature_2

Conflicts:
	README.md