Keep up with rust
Merge pull request #136 from Valve/master

Keep up with rust