Merge branch 'patch-1' into 'master'

Update CHANGELOG

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