Merge branch 'hotfix/1.0.5'
Fixed static attachments not being sent via e-mail
Merge branch 'hotfix/1.0.6' into develop