allow for libpng 1.5.x
Merge branch 'PHP-5.5'

* PHP-5.5:
  allow for libpng 1.5.x