Merge 1.2:CHANGELOG