Merge branch 'master' into 'develop'

Master

See merge request !343
2 jobs for develop in 3 minutes and 19 seconds (queued for 2 seconds)