Proper handling for aborted timers. #78

1 job for master