correct ChangeLog.md
Merge branch 'develop' into v.2.3.0