Bump to v2.6.0
Merge branch 'release/2.6.0' into dev