fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627