Merge branch 'jk/sane-relative-time'