Merge branch 'patch-1' into 'master'

Update CHANGELOG

See merge request !1114
32 jobs for master in 12 minutes and 50 seconds (queued for 1 second)