Merge branch '2.5.x'