Dummy-merge 2.5 branch into 2.6 branch.