Added tag 6.0 for changeset ec4baab78314