Moving from SES to gmail
Merge branch 'hotfix/0.10.2'