event display end. fix #330
Merge remote-tracking branch 'upstream/master' into feature/330-event-display-end
event display end 2.fix #330
Merge pull request #338 from ebowsoft/feature/330-event-display-end

event display end. fix #330