Merge branch 'master' into 'master'

FAQ-Wiki

See merge request !231
2 jobs for master in 2 minutes and 44 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed test #1419173

00:00:10

 
  Deploy
passed production #1419174

00:02:33