Updated changelog to reflect latest merge.