Merge "Use PHP_OS rather than php_uname, which may be disabled"