Pull in upstream change to Ruby