While looking at #306224 it hit me that possibly the patch in #389996 would maybe also solve this problem? Just thought I'd mention it...
-- Regards, Andreas Henriksson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]