Merge branch 'jx/blame-align-relative-time' into maint