Merge "Update phpunit to 4.8.24"