Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2' * commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2': TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2' * commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2': TimedEventQueue is apparently important for glitch-free media playback, and so