Fix context menu events being fired with undefined parameter.
Merge remote-tracking branch 'refs/remotes/origin/fix-for-context-menu'