Merge pull request #1 from ValveSoftware/master

Merging