Update of CHANGELOG.md
Merge branch 'release/2.1.0' into develop

* release/2.1.0:
  Update of CHANGELOG.md