Merge change Ib64ea2dd into eclair-mr2

* changes:
  Improvements to TimedEventQueue.