Merge branch 'master' into 'develop'

Master

See merge request !356
2 jobs for develop in 3 minutes and 3 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #9237
snapshot

00:01:54

 
  Selenium
passed #9238
selenium

00:01:09