Merge branch 'master' into 'preprod'

# Conflicts:
#   app/view/campaign/faq.html
10 jobs for preprod in 1 minute and 49 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #5206
preprod
job test

00:00:13

canceled #5203
preprod
job test

00:04:53

passed #5205
preprod
job test

00:00:13

failed #5197
preprod
job test

00:00:08

failed #5200
preprod
job test

00:00:07

failed #5202
preprod
job test

00:00:07

 
  Cleanup Test
passed #5204
preprod
cleanup test

00:00:07

failed #5198
preprod
cleanup test

00:00:07

failed #5201
preprod
cleanup test

00:00:06

 
  Deploy
passed #5199
preprod
job install

00:01:27