Updates for latest Rust master