Merge branch 'master' into develop
Merge branch 'flaneurz_prod' of github.com:wawax/dolibarr into flaneu… …rz_prod