Bump version number and update history
Merge branch 'release/0.6.1' into develop