Merge branch 'develop' into 'master'

develop into master

See merge request !426
3 jobs for master