EventShim synced with upstream

Thanks for accepting pull requests jwmcpeak :-)