Merge pull request #1539 from ripieces/master

Fixes ValveSoftware/halflife#1536