Email bug hotfix
Merge branch 'develop'