Added tag 6.1 for changeset 55c924ecc419