fix typo
Merge branch 'master' into race-detection

Conflicts:
	src/hthread.h