Merge branch 'develop' into 'master'

Dev to Master for release

See merge request diasporg/Poduptime!242
2 jobs for 2.6.1 in 1 minute and 37 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Test
passed #10527
test:7.2

00:01:37

passed #10528
test:7.3

00:01:36