Added tag 0.6.1 for changeset d96669c58750