Update for latest master (0.9-pre 90d06ec)