Fixed on trunk via check-in [9ad5a7514f35a5a2].