master1
Merge branch 'master' into branchB

Conflicts:
	README.md