Merge branch 'jk/sane-relative-time' into maint