Added tag 0.6-5 for changeset 21b4f22a4c92