Merge branch 'develop' into 'master'

Develop

See merge request !234
2 jobs for master in 1 minute and 54 seconds (queued for 1 second)
Status Name Job ID Coverage
  Before
passed documentation #4794

00:00:38

 
  Build
passed snapshot #4795

00:01:16