Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4' * commit 'ed9880f399015782c9f635db744d25281d0deeb4': Improvements to TimedEventQueue.
Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4' * commit 'ed9880f399015782c9f635db744d25281d0deeb4': Improvements to TimedEventQueue.