[04:18] <wxl> bug 1378042 includes a branch that fixes the bug, but development is primarily upstream on sourceforge. can this bug be merged and then pushed upstream or is it better that the fix be applied upstream and wait for it to trickle down?