Changelog for version 6.1
Merge branch 'changelog-v6.1' into develop