update for Rust master