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

* 'master' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Add missed file
  Use if_nametoindex in Vista
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
  fix crashes in newly introduced macros when normal trace is disabled but memory traced is enabled.