Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9

diff --cc ext/imap/php_imap.c
Simple merge

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