Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312

diff --cc NEWS
index 80e91c4dd16f4525f2b9bb85dbb9c4b1f710ee58,a3d844d7cf1cf64f041ee3aeaf4309da0996913e..6e00126ce63129aa69eb1d2412f771813ac70c50
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -70,9 -60,10 +70,11 @@@ PH
    . Fixed bug #70490 (get_browser function is very slow). (Nikita)
    . Fixed bug #73265 (Loading browscap.ini at startup causes high memory usage).
      (Nikita)
 +  . Add subject to mail log. (tomsommer)
+   . Fixed bug #31875 (get_defined_functions additional param to exclude
+       disabled functions). (willianveiga)
  
 -- Zlib:
 +- Zlib
    . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
      (Matt Bonneau)
  

diff --cc Zend/zend_builtin_functions.c
Simple merge