Merge pull request #3 from sfackler/master

Update to match rust-lang/rust#34753