Don't apply time shifting more than once
Merge pull request #1616 from wmtan/ProtectAgainstMultipleOffsets62X

Prevent applying time offset multiple times