My own ChangeLog entries, plus some cleaning up.
(cherry picked from commit 92938c507a120b9d777f4819cf34430bdc0f494e)