Merge pull request #1871 from saper/EADDRINUSE