Updated for Rust 5419b2ca2 2014-08-29