Update Changes file
Bump version to 2.096000
Update Changes file
Merge branch 'rc'
Bump version to 2.097_000