Merge branch 'develop' into 'master'

Develop

See merge request !349
2 jobs for master in 3 minutes and 25 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #9027
snapshot

00:02:16

 
  Selenium
passed #9028
selenium

00:01:09