This is fine. I've taken the liberty of merging it to master,
no CHANGES note.