Comment 24 for bug 1306294

Still working on the final part of this fix, which should be ready early in J3, it's not going to make J2 though unfortunately, so bumping the milestone target.