Fixed error with test email
Merge branch 'development' of https://github.com/infiniteautomation/ma-core-public.git into development