Added tag 2.6 for changeset 5308dd22b6ee8e3218c81d9e7e4125f235bb5778