Updated to Rust master