Merge branch 'master' into capture-delivery-outcomes

Conflicts:
	tests/app/notifications/test_rest.py

app/clients/email/aws_ses.py

@@ -52,6 +52,7 @@ class AwsSesClient(EmailClient):
                    to_addresses,
                    subject,
                    body,
+                   html_body='',
                    reply_to_addresses=None):
         try:
             if isinstance(to_addresses, str):
@@ -61,6 +62,15 @@ class AwsSesClient(EmailClient):
             elif reply_to_addresses is None:
                 reply_to_addresses = []
 
+            body = {
+                'Text': {'Data': body}
+            }
+
+            if html_body:
+                body.update({
+                    'Html': {'Data': html_body}
+                })
+
             start_time = monotonic()
             response = self._client.send_email(
                 Source=source,
@@ -73,9 +83,7 @@ class AwsSesClient(EmailClient):
                     'Subject': {
                         'Data': subject,
                     },
-                    'Body': {
-                        'Text': {
-                            'Data': body}}
+                    'Body': body
                 },
                 ReplyToAddresses=reply_to_addresses)
             elapsed_time = monotonic() - start_time