Merge remote-tracking branch 'weierophinney/hotfix/event-manager-shared'