Rustup 20140508

r? @SimonSapin 

Is this what you'd expect? (merge into master)