Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !62
2 jobs for v7.0.1 in 3 minutes
latest