Add ChangeLog entries for changes from 639c42d7ab7 to 91f9e616645