timeout = 0 leads to erratic behaviour. Allowing timeout = 0 is considered unsafe
Merge pull request #546 from niphlod/fix/scheduler

timeout = 0 leads to erratic behaviour.