Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !50
2 jobs for v4.1.0 in 1 minute and 33 seconds
latest