Fix for https://bugs.php.net/bug.php?id=62649
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix for https://bugs.php.net/bug.php?id=62649