SOCK PROXY FIXES. RAWR.
Merge branch 'master' into beta