Added tag 2.5 for changeset 0dd0062a6480