Merge pull request #511 from beretta42/socket
authorEtchedPixels <alan@etchedpixels.co.uk>
Tue, 15 Aug 2017 21:31:24 +0000 (22:31 +0100)
committerGitHub <noreply@github.com>
Tue, 15 Aug 2017 21:31:24 +0000 (22:31 +0100)
Various fixes/bugs for recent socket changes


Trivial merge