Update references to 2.6 for master