master-test
Merge commit '4cfb09f2c86da6dfff7ce35631c9aa7687b0f5c0' into branchB

Conflicts:
	file2.txt