Update to 2.6beta

Change-Id: Icd33087ff2478b6e5db46fb5b7acc79b9a1a5df9