Added tag 2.6.0 for changeset 18a36cd1455f