Merge pull request #587 from L5D/master

More protocol