Update changelog and version numbers
Merge branch 'release/0.6.1' into develop