more consistent time-until formatting
merge from upstream (3bee0f08b71c7558abfa7a4e3a6c39eaa3aa6e1c)