Update for Rust 0.13