Merge ChangeLog updates