This is 2.6
Merge branch '2.x-maintenance'