Merge remote-tracking branch 'origin/master'
[Silviu] added checks for email configuration