Modifications on the mails
Merge remote-tracking branch 'origin/develop' into develop