Update changelog for recent merges.