Added bugfixes to CHANGELOG.
Merge branch 'maint-2.4.0'