Fixed an overflow bug with the client timeout
Merge pull request #939 from pveentjer/fix/3.x/client-timeout-overflow-bug

Fixed an overflow bug with the client timeout