Merge branch 'master' into 'develop'

Master

See merge request !13
2 jobs for develop in 2 minutes and 33 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Linux
passed #1086340
BranchJobLinux

00:02:33

failed #1086265
BranchJobLinux

00:00:47