Updated for Rust 5d335c94b 2014-09-20