merge of rbalint/fake-timers