Item 701
Merge pull request #716 from sendgrid/cstimms

Item 701