Added tag 3.6 for changeset 0bc2751d06e8