Changed EventDispatcher to TraceableEventDispatcher for Symfony 2.4 compatibility
Merge branch 'develop'