Update for latest master (0.9-pre b5bab85)