commit done by branch3 sid
Merge branch 'master' into branch2

Conflicts:
	test.txt