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