Merge branch 'master' into refactoring/preparation-for-branch-path-opcode-coverage

Author: sebastianbergmann

src/CodeCoverage/Filter.php

@@ -312,7 +312,7 @@ private function prefillBlacklist()
         $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_Story_TestCase', 2);
         $this->addDirectoryContainingClassToBlacklist('Text_Template');
         $this->addDirectoryContainingClassToBlacklist('Symfony\Component\Yaml\Yaml');
-        $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Diff');
+        $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Diff\Diff');
         $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Environment\Runtime');
         $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Comparator\Comparator');
         $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Exporter\Exporter');