Merge branch 'master' into 'develop'

Master

See merge request !306
3 jobs for develop in 3 minutes and 48 seconds