Bump version. Update changelog
Merge branch 'release/0.9.6' into develop