Added tag 0.6-4 for changeset c65a4a53c3ab