Updating AWS CloudFormation
Merge branch 'cloudformation-update'