improved support for tracking nested events
Merge branch 'foreach-fix'
version bumped