Updated CHANGELOG
Post-rebase fix
Issue #1938