Bump to version 6
Update changelog
Merge branch 'release-6' into develop