Comment 12 for bug 741528

Created attachment 519897
Proposed patch (my v3)