Change algorithm for demo playback to allow time multiplier.
Merge remote-tracking branch 'origin/master'