This has been fixed in the trunk.