ChangeLog entries (+few typo fixes) for the last merges