Merge branch '6.2' into 6.3

* 6.2:
  Fix build

Author: OskarStark

mailer.rst

@@ -175,7 +175,7 @@ Provider              SMTP                                          HTTP
 `Amazon SES`_         ses+smtp://USERNAME:PASSWORD@default          ses+https://ACCESS_KEY:SECRET_KEY@default  ses+api://ACCESS_KEY:SECRET_KEY@default
 `Google Gmail`_       gmail+smtp://USERNAME:APP-PASSWORD@default    n/a                                        n/a
 `Infobip`_            infobip+smtp://KEY@default                    n/a                                        infobip+api://KEY@BASE_URL
-`Mailchimp Mandrill`_ mandrill+smtp://USERNAME:PASSWORD@default     mandrill+https://KEY@default               mandrill+api://KEY@default
+`MailChimp Mandrill`_ mandrill+smtp://USERNAME:PASSWORD@default     mandrill+https://KEY@default               mandrill+api://KEY@default
 `MailerSend`_         mailersend+smtp://KEY@default                 n/a                                        mailersend+api://KEY@BASE_URL
 `Mailgun`_            mailgun+smtp://USERNAME:PASSWORD@default      mailgun+https://KEY:DOMAIN@default         mailgun+api://KEY:DOMAIN@default
 `Mailjet`_            mailjet+smtp://ACCESS_KEY:SECRET_KEY@default  n/a                                        mailjet+api://ACCESS_KEY:SECRET_KEY@default