Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 #152