updates for Rust master