Version 2.6.0
Merge branch 'release/v2.6.0' into develop