Version history items for #3239,#3240, and #2291 ended up in 7.9.5
section instead of 7.9.6.  All moved.
Merge branch 'V7_9_6-branch'