Merge pull request #25 from FlaminSarge/master

More of Valve's Halloween 2014 changes