Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !41
2 jobs for v4.0.0 in 1 minute
latest