Bug#876597: Fix in preparation

[Ross Gammon]

Control: tags -1 pending

Hi,

I have prepared a fix. It just needs a quick test, and the patch
forwarding upstream. An upload will follow shortly after.

Regards,

Ross