Comment 4 for bug 945245

I'll mark this bug as fixed, as the branch that takes care of the majority of issues has been merged and released.

Gabor, for the parts where you still feel need a better fix, would you mind opening separate follow-up bugs?

Thanks!