Fix: PHPUnit tests are back.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql