Merge branch 'hotfix/0.4.1.2'
merging from upstream to try to fix integration with sendgrid, FB, twitter