Fix bad logic in server timeout handling
Sync version tags 1.0.4