New version: 2.6

Change-Id: I57b302e1c0226d04d33784059a73c97b61d93f8a