timeout: move out some other stuff
interval: move out some other stuff
Merge remote-tracking branch 'upstream/master'