Update CHANGES, version number
Merge branch 'release/0.6.1' into develop
Back to development: 0.7