Changed back to original AWS credentials.
Changed back to original AWS credentials.
Changed back to original AWS credentials.
Merge branch 'staging' into production