Added tag 1.6 for changeset f46131295acb