Merge pull request #131 from dadbodgeoff/remediation/security-convention-s3