Merge branch 'master' into branchA

Conflicts:
	A.txt