Merge hiphop-php