Bug#847556: Proposed patch

[Barak A. Pearlmutter]

Thanks that's fantastic, i appreciate your looking into it. I'll get this
uploaded as soon as NIPS is over and its chemical aftereffects have cleared
my system.