Fix issue with S3 and weird characters
Merge branch 'fix-s3-upload-characters'