maint - update changelog
Merge branch '2.4.x'