Pull in Goakley's commits