Added timeout safety
Merge branch 'master' into feature/timeout-safe
Backfilled CHANGELOG
Added missing dependency on 'timeout', fixed comments on retry_x
Updated date