Update to latest master (0.8-pre d8b299d)