Update for 0.10-pre