Commit
Merge branch 'hotfix'

Conflicts:
	Hotfix.txt