(cherry picked from commit 311f013289) Conflicts: htdocs/comm/mailing/fiche.php htdocs/lib/files.lib.php
311f013289