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

Conflicts:
	htdocs/core/class/CMailFile.class.php

htdocs/core/db/DoliDB.class.php

@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';
  */
 abstract class DoliDB implements Database
 {
-	/** @var bool|resource Database handler */
+	/** @var bool|resource|SQLite3 Database handler */
 	public $db;
 	/** @var string Database type */
 	public $type;