Merge branch 'PHP-5.6'

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge