Update to last 0.9-pre