Merge branch 'hotfix/1.2.1' into develop
Fix catchAllEmail bug
Merge pull request #7 from soderluk/feature/fix-catch-all-emails

Feature/fix catch all emails