Merge branch '2.6'