Changes from the 0.9.8 branch.