Use long constants for timeouts, preventing incorrect binding to int hash parameter.
Merge remote-tracking branch 'remotes/origin/master' into compress