Merge pull request #1 from Dolibarr/develop

Update from original