Merge branch 'develop' into 'master'

2.6.0 release merge

See merge request !236
2 jobs for remote-pull-ease in 2 minutes and 45 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2712
test:7.2

00:01:24

passed #2713
test:7.3

00:01:20