Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken * commit '98c5bd5556f32a237d3483fb7298284869e32a40': Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.