hotfix from release one
Merge branch 'release1' into dev

Conflicts:
	file1.txt