I have now commited a fix for collector issue #177 (yeah, I know I said it was already fixed earlier, but then I really ment issue #168 then..). Anyway, I guess the next step is then to merge this into some other branches. The question then are, who should do this merge, and if I should, to which branches?