Comment 15 for bug 1382977

(In reply to Eric Koegel from comment #9)
> Created attachment 5715 [details]
> Guido's patch
>
> This is Guido's patch in a git am-able format.

Thanks, but Evangelos should be credited for investigating and fixing this, I only did some minor refactoring.