Merge branch 'master' into master-merge

Conflicts:
	README.md