Add CHANGELOG.md
Merge branch 'master' into 2.0.0