Bug 1098017

Hoping this changes in the new version, I think using a threaded SocketServer would be useful here