Added tag 0.8-35 for changeset 6e15ece1da30087a9d3af94e124ebea7c12257c3