Fix to the e-mailing
Merge branch 'hotfix-2.1.11' into develop