Release 2.6.0
Merge from branch '2.5.x'