Ensure struct enumerator on TouchCollection
Merge pull request #2737 from danzel/touchcollection-enumerator

Ensure struct enumerator on TouchCollection
Merge back from develop