Merge branch '4.5' into 4.6

Author: sebastianbergmann

composer.json

@@ -25,7 +25,7 @@
         "php": ">=5.3.3",
         "phpunit/php-file-iterator": "~1.3",
         "phpunit/php-text-template": "~1.2",
-        "phpunit/php-code-coverage": "~2.0",
+        "phpunit/php-code-coverage": "~2.0,>=2.0.11",
         "phpunit/php-timer": "~1.0",
         "phpunit/phpunit-mock-objects": "~2.3",
         "phpspec/prophecy": "~1.3.1",