Merge branch 'develop' into 'master'

Develop

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

00:00:36

 
  Build
passed snapshot #4807

00:01:16