Bring 0.10.x up to date