Merge pull request #132 from dadbodgeoff/remediation/security-convention-s2