Merge branch 'hotfix/pause.before.processing.folder'
timeout downloads

if downloads are taking too long, timeout the request.
Merge branch 'hotfix/timeout.downloads' into develop