Pull in 0.4.x line changes.