Update to latest rust-master