Update CHANGELOG
Merge branch 'changelog'