Merge branch '1.1'

Conflicts:
	ChangeLog.markdown
	package.xml

PHP/CodeCoverage/Filter.php

@@ -258,6 +258,7 @@ public function isFile($filename)
         if ($filename == '-' ||
             strpos($filename, 'eval()\'d code') !== FALSE ||
             strpos($filename, 'runtime-created function') !== FALSE ||
+            strpos($filename, 'runkit created function') !== FALSE ||
             strpos($filename, 'assert code') !== FALSE ||
             strpos($filename, 'regexp code') !== FALSE) {
             return FALSE;