Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
Merge branch 'PHP-5.6'