Merge branch 'develop' into 'master'

2.5.2 merge

See merge request diasporg/Poduptime!230
2 jobs for 2.5.2 in 1 minute and 54 seconds (queued for 2 minutes and 33 seconds)
latest
Status Job ID Name Coverage
  Test
passed #2261
test:7.2

00:01:49

passed #2262
test:7.3

00:01:52