Merge: LoopForever and ThreadTrace helpers

Conflicts:
	src/test/util_tests.cpp