Fixed on trunk via check-in [349fd3a23ee8551d].