Merge branch 'develop' into 'master'

Develop

See merge request !233
2 jobs for master in 1 minute and 54 seconds (queued for 2 seconds)