Update version number.
Update CHANGES file.
Merge branch 'release/1.9.6'