Added tag 0.6-5 for changeset 4f5e6b68ca8e24405950f2706b00debe20acdea5