Patch applied, on trunk.