Patch applied to the trunk rev. 14426.
Feel free to revert if there's a more elegant or efficient fix.
Patch applied to the trunk rev. 14426.
Feel free to revert if there's a more elegant or efficient fix.