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

diff --combined public/index.php
index e06ff49,418b63b..6c1ddb7
--- 1/public/index.php
--- 2/public/index.php
+++ b/public/index.php
@@@ -5,17 -5,21 +5,21 @@@ Zend\Loader\AutoloaderFactory::factory(
  
  $appConfig = include 'config/application.config.php';
  
+ $sharedEvents     = new Zend\EventManager\SharedEventManager();
  $listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
  $defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
 -$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/{,*.}{global,local}.config.php");
 +$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
      
  
  $moduleManager = new Zend\Module\Manager($appConfig['modules']);
- $moduleManager->events()->attachAggregate($defaultListeners);
+ $events        = $moduleManager->events();
+ $events->setSharedCollections($sharedEvents);
+ $events->attach($defaultListeners);
  $moduleManager->loadModules();
  
  // Create application, bootstrap, and run
  $bootstrap   = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig());
+ $bootstrap->events()->setSharedCollections($sharedEvents);
  $application = new Zend\Mvc\Application;
  $bootstrap->bootstrap($application);
  $application->run()->send();