Added tag 3.5 for changeset 98f29d521c3a