Sync master ChangeLog up with version in 3.6.x branch.