Added tag 3.6.1 for changeset 20ec6976cee1