Merge branch 'master' of https://github.com/tacone/progressive-timeout.js