Attempting to fix a brittle test of Concurrent::timer.
Merge branch 'master' into block_observer