interval: fix #start
timeout: move the initialization to #start
Merge remote-tracking branch 'upstream/master'