Merge 0.10->trunk

diff --cc net/server_event.lua
Simple merge

diff --cc net/server_select.lua
index 35dcb5a75cc336de133cc043d772e400ae3c1a61,87921df4badc579d21fa70b83cd92af02ac6f414..ced73074d56f981357eb6b3513df3949825b8942
--- 1/net/server_select.lua
--- 2/net/server_select.lua
+++ b/net/server_select.lua
@@@ -932,8 -894,24 +932,9 @@@ loop = function(once) -- this is the ma
                                end
                        end
                end
 -
 -              -- Fire timers
 -              if _currenttime - _timer >= math_min(next_timer_time, 1) then
 -                      next_timer_time = math_huge;
 -                      for i = 1, _timerlistlen do
 -                              local t = _timerlist[ i ]( _currenttime ) -- fire timers
 -                              if t then next_timer_time = math_min(next_timer_time, t); end
 -                      end
 -                      _timer = _currenttime
 -              else
 -                      next_timer_time = next_timer_time - (_currenttime - _timer);
 -              end
 -
 -              -- wait some time (0 by default)
 -              socket_sleep( _sleeptime )
        until quitting;
        if once and quitting == "once" then quitting = nil; return; end
+       closeall();
        return "quitting"
  end