version and changelog
Merge branch 'release/2.1' into develop