Merge branch 'master' into 'develop'

Master

See merge request !281
3 jobs for develop in 4 minutes and 1 second