fixed bug in hotfix
Merge branch 'master' into cr01

Conflicts:
	hello.c
merged from master