Version bump.
Merge branch 'release/v2.10.5' into develop