Fix: Removed a merged that we ddidn't want.
Fix: Restore style code lost by a commit.
No need to send email for each error. First one is enough.
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5