Update for rust-master