Fixing time check for years > 2000

Purves, Murrayrequested to merge
mpurves/haem:time-fix into time-fix

Migrating forked branch to parent repo

Merge request reports