Added tag 0.9 for changeset febed0c4cd93