Comment 4 for bug 1663595

@Nick, it's only fixed in my branch. I haven't merged yet because that branch also contains the new zone fill algorithm, which needed quite a bit of testing. But I think it's nearly ready....