Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time