(cherry picked from commit 6751a8a9cf) Conflicts: adminstuds.php app/classes/Framadate/Utils.php creation_sondage.php
6751a8a9cf
(cherry picked from commit 1a5846a156)
1a5846a156