Version bump and history
Merge branch 'release/2.11.6' into develop