Update CHANGES for recent merge
1 file changed