This is actually 2.5-dev
Merge branch '2.x-maintenance'