Don't require unpausing to rewind time.
Merge remote-tracking branch 'upstream/master'