Update for Rust master