hotfix two
Merge branch 'master' into hotfix1

Conflicts:
	sample.txt