Comment 14 for bug 1410793

Attaching diff used for custom build (see comment 6 and 7) for review/comments.

I'm planning to apply the same diff for the 0.91 release build - there will be unpatched packages available for testing (likely via DropBox).