Added tag 3.6 for changeset 692ab5c3c197