Merge branch 'develop' into 'master'

[2.6.2] - 2019-11-24

See merge request diasporg/Poduptime!245
2 jobs for 2.6.2 in 1 minute and 34 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Test
passed #10529
test:7.2

00:01:34

passed #10530
test:7.3

00:01:33