Bart Van Assche - 2011-12-05

Fixed via commit 7f05daa8e0e0f533b0f12a3e1cf07641519909d6 on the 5.4, 5.5, 5.6, 5.7 and master branches.