Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !122
1 job for v2.6.0 in 47 seconds (queued for 1 second)
latest