Pull in last fix before 1.0