Merge branch 'master' into 'develop'

Master

See merge request !351
2 jobs for develop in 3 minutes and 30 seconds (queued for 55 seconds)
Status Job ID Name Coverage
  Build
passed #9071
snapshot

00:02:18

 
  Selenium
passed #9072
selenium

00:01:11