Longer timeout on retries
Merge remote-tracking branch 'upstream/master' into ddb_timeout
Merge pull request #91 from talko/ddb_timeout

Ddb timeout