Merge branch 'patch-1' into 'master'

CHANGELOG timestamp

See merge request !920
32 jobs for master in 13 minutes and 15 seconds (queued for 1 second)