Merge branch 'master' into 'develop'

Master

See merge request !328
3 jobs for develop in 3 minutes and 32 seconds (queued for 1 second)