Added tag 0.6 for changeset fa018e389583