merge: stable heads I forgot to pull before rolling rc1, so we just have a couple of patches that missed the rc1 train. Mea culpa.

edition = "2018"
max_width = 79
wrap_comments = true
error_on_line_overflow = true