Fixed in trunk by check-in [7d432770a9].