DiWrapper as fallback for Zend\ServiceManager
Merge remote-tracking branch 'origin/master'