Fixed on trunk by check-in [dff9a878dd].