[ issue 1236 ] CHANGELOG entry.
Merge branch 'maint-2.4.0'