Squashed commit of the following:...
Conflicts:
	test.txt
Merge branch 'master' into Branch_feature