Merge branch 'master' of git.php.net:php-src

# By Anatol Belski
# Via Anatol Belski
* 'master' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  fix ZTS