Merge pull request #3076 from akoeplinger/fix-ziptime-offbyone