Comment 15 for bug 1020904

Hi Marcus and Sebastian - Thanks for the patch!

It fixes some issues that were previously reported in a private bug report. I started work on fixing those issues and then, unfortunately, allowed the patches to bit rot for far too long.

I'm taking a look at the differences in Sebastian's patch and my set of patches and I'll respond again after that is complete.