Bug#1064298:

[Michael Hudson-Doyle]

Hi, thanks so much for this. I've updated the diff in bug 1064090 to
include your changes (and uploaded the new package to experimental as
~exp2).