Bump version to 2.6.0.5
Merge branch 'release/2.6.0.5' into develop