Merge AWS S3 support, by @howech