Update changelog and version to 6.1