Merge pull request #1309 from baryonix/time_fix