Updated changelog to reflect recent merges.