update CHANGES to correctly reflect what was merged from 1.2