Merge branch 'develop' into 'master'

[2.6.2] - 2019-11-24

See merge request diasporg/Poduptime!245
2 jobs for master in 1 minute and 40 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #10525
test:7.2

00:01:39

passed #10526
test:7.3

00:01:38