Fix bug 922313 - Add S3 image upload support