Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !47
2 jobs for v4.0.1 in 1 minute and 23 seconds
latest