Merge pull request #262 from loicseguin/handle-timeout

Handle timeout in FileContainer
Merge branch 'master' into sdss-timeout