Merge pull request #1 from rust-lang/master

Update