Merge pull request #1292 from gtristan/work-around-zero-mtime

Work around mtime being set to 0 sometimes