fix redis timeout handling
Merge remote-tracking branch 'origin/redis-timeout' into redis-timeout