Update for latest master (0.9-pre b42c438)