Minor typo fix for bug#1192118.
Merge branch 'release_30' into release_31

Minor typo fix for bug#1192118.
Fix TEvent handling so it doesn't crash anymore.