Merge branch 'develop' into 'master'

[2.6.2] - 2019-11-24

See merge request !245
2 jobs for 2.6.2 in 47 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #6063
test:7.2

00:00:37

passed #6064
test:7.3

00:00:46