Fixed by check-in [e96f0d17a5] on trunk.