Fixed overflow bug in client timeout
Merge pull request #940 from pveentjer/fix/3.maintenance/client-timeout-overflow-bug

Fix/3.maintenance/client timeout overflow bug