Update to rust-master