Update Changelog for recent merge
1 file changed