make logging tests work deterministically
Merge branch 'master' into blaze
more BS3 updates

Update timers to use reactive time