FIX: disabled death switch thread for now (it killed applications unexpectedly in CAVE2)
Merge branch 'master' into endurance-hacks

Conflicts:
	src/omega/Engine.cpp