changed test3-iss53
changed test3 hotfix
test3 fixed-iss53
Merge branch 'iss53'

Conflicts:
	test3.txt