sync with rust 42deaa5e4
Merge pull request #1 from erickt/master

sync with rust 42deaa5e4