Update changelog.md
Merge branch 'release-0.2.6' into develop