Merge tag 'v3.4.96'

This is the 3.4.96 stable release