update CHANGELOG
Merge pull request #12624 from timsly/master

update CHANGELOG