Update for Rust/Cargo master