Changelog for version 6.0
Merge branch 'changelog-v6.0' into develop