Merge branch 'schleuder-3.6.0' into 'master'

Schleuder version 3.6.0

See merge request !93
2 jobs for master in 1 minute and 13 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #185473
build

00:00:19

 
  Deploy
passed #185474
deploy

00:00:53