Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>

diff --cc NEWS
index 928f25f915de479f7395c10ae8adce51db86f141,19dc26829b85a78c8e37b8a1c664cd5eeef517f0..d0c0efa919a95cb456ecf37088a6463a6e14c756
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,7 -9,7 +9,8 @@@ PH
      (jhdxr)
    . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
    . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
 +  . Fixed bug #74923 (Crash when crawling through network share). (Anatol)
+   . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
  
  - Date:
    . Fixed bug #74852 (property_exists returns true on unknown DateInterval 

diff --cc sapi/phpdbg/phpdbg.c
Simple merge