Merge branch 'develop' into 'master'

Dev to Master for release

See merge request !242
2 jobs for 2.6.1 in 2 minutes and 39 seconds (queued for 1 minute and 41 seconds)
latest
Status Job ID Name Coverage
  Test
passed #3477
test:7.2

00:01:21

passed #3478
test:7.3

00:01:18