JFTR, this works fine without the patch using trunk. So it may be possible to remove the patch when updating to 1.6
JFTR, this works fine without the patch using trunk. So it may be possible to remove the patch when updating to 1.6