Closing the 2.6 branch