Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !58
2 jobs for v6.0.0 in 2 minutes and 1 second
latest