testing that socket IS a socket before using it
Merge branch 'master' into local