Deal with sockets not closing correctly
Merge branch 'close-timeout' into gitter