Merge "Improve detection of php binary."