Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 13 Jun 2017 14:17:57 +0000 (17:17 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 13 Jun 2017 14:17:57 +0000 (17:17 +0300)
* 'master' of git.php.net:php-src:
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY


Trivial merge