Make PHP_CodeCoverage 1.3 compatible with Xdebug < 2.2
Merge branch '1.3'