Uploader
Merge upstream
S3 uploader fix
Merge branch 'uploader'