Removed drainer that mysteriously disappeared in merge... wtf.
Merge branch 'next' into sam_fix_build
Used labs instead of abs in TimerTest.