Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed memory leaks in parse_ini_file()

diff --cc Zend/zend_ini_parser.y
Simple merge

diff --cc ext/standard/basic_functions.c
Simple merge