Update CHANGELOG
Merge branch '2.0.x'