Added tag 0.9-7 for changeset 8306ecc7e873c2daf89cf76414ef3665095aac51