Merge pull request #2433 from mozilla/rustup_20140511

Rust upgrade