master1
Merge branch 'master' into branchC

Conflicts:
	README.md
master1