Merge pull request #271 from fpapon/collector-s3