FIX: CDN doesn't work with S3
Merge pull request #1208 from ZogStriP/fix-cdn-does-not-work-with-s3

FIX: CDN doesn't work with S3