Merge pull request #3069 from splitbrain/event-msg-show