Add ChangeLog entries for changes from 91f9e616645 to 2ecae81f1