> Could you please rebase on top of current master

> Please also add a ChangeLog entry for this change as per CONTRIBUTE, if
> possible, and I think we need an entry in etc/NEWS.

I updated the patch with a etc/NEWS entry and verified it applies
cleanly on the master branch.