Update for 0.8-pre (ed695d4)