Fixed on trunk via check-in [c07cca890b].