Merge "Upgrade from PHPunit 3.7.x to PHPUnit 4.8.x"