hotfix commit
Merge hotfix to master

Conflicts:
	test.txt