Merge branch 'master' into 'preprod'

# Conflicts:
#   app/controller/perso.php
3 jobs for preprod in 1 minute and 33 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #4329
preprod
job test

00:00:18

 
  Cleanup Test
skipped #4330
preprod
cleanup test
 
  Deploy
passed #4331
preprod
job install

00:01:15