Merge branch 'master' into log-refactoring-1

1 files changed, 5 insertions, 2 deletions

diff --git a/core/Container/StaticContainer.php b/core/Container/StaticContainer.php
index 39a6552ef6..96a3742317 100644
--- a/core/Container/StaticContainer.php
+++ b/core/Container/StaticContainer.php
@@ -49,11 +49,14 @@ class StaticContainer
      */
     private static function createContainer()
     {
-        if (!class_exists("DI\\ContainerBuilder")) {
-            throw new \Exception("DI\\ContainerBuilder could not be found, maybe you are using Piwik from git and need to update Composer. $ php composer.phar update");
+        if (!class_exists('DI\ContainerBuilder')) {
+            throw new \Exception('DI\ContainerBuilder could not be found, maybe you are using Piwik from git and need to update Composer: php composer.phar update');
         }
+
         $builder = new ContainerBuilder();
 
+        $builder->useAnnotations(false);
+
         // TODO set a better cache
         $builder->setDefinitionCache(new ArrayCache());