Bug#823435:

[Michael Lustfield]

I'm really happy I read this prior to another similar but not
identical bug report.

Thanks for the patches! I will try to review/test/commit tonight.