Merge branch 'master' into 'develop'

merge Master into dev

See merge request !31
1 job for develop in 4 minutes and 52 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Linux
passed #1086089
BranchJobLinux

00:04:52