fixed on bug-fix
Merge branch 'bug-fix'

Conflicts:
	bugfix.txt