Gavin Smith proposed a patch for this back in http://bugs.gnu.org/34201
Another reference to the problem: http://bugs.gnu.org/36921

In the attached (in Gavin's name), I've added a NEWS entry and
adjusted the ChangeLog entry. Will push in a day or so if no comment.