Update to latest master (0.8-pre 4989799)