Merge branch '1.2'

Author: whatthejeff

PHP/CodeCoverage/Filter.php

@@ -304,6 +304,10 @@ public function hasWhitelist()
      */
     protected function prefillBlacklist()
     {
+        if (defined('__PHPUNIT_PHAR__')) {
+            $this->addFileToBlacklist(__PHPUNIT_PHAR__);
+        }
+
         $this->addDirectoryContainingClassToBlacklist('File_Iterator');
         $this->addDirectoryContainingClassToBlacklist('PHP_CodeCoverage');
         $this->addDirectoryContainingClassToBlacklist('PHP_Invoker');