Merge branch 'unixtimefix' into release-3.11

Merge-request: !1800