Merge branch 'master' into IOMultiplexer

Conflicts:
	src/signal.c

diff --cc src/signal.c
index d427ae2e9510884b927b02f4005899d2d37ede6d,9acfd2cdbde71374994c438a4f0b32be81b4819f..175f61150db18ba33863ba979eef4d3953be9eef
--- 1/src/signal.c
--- 2/src/signal.c
+++ b/src/signal.c
@@@ -86,9 -85,8 +86,9 @@@ static void sigcrash(int signum) 
      struct ClientSocket *bot;
      for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
          if((bot->flags & SOCKET_FLAG_CONNECTED)) {
 -            close(bot->sock);
 +            iohandler_close(bot->iofd);
-             bot->flags &= SOCKET_FLAG_CONNECTED;
+             bot->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY);
 +            bot->iofd = NULL;
          }
      }
      putlog(LOGLEVEL_INFO, "hard shutdown...\n");