Bumped the changelog [#2.6.0]
Merge branch 'release/2.6.0' into develop