Dummy-merge 2.6 branch into 2.7 branch.