Merge branch 'develop' into 'master'

Develop

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

00:00:38

 
  Build
passed snapshot #4791

00:01:16